From ba7645032a6030770526825ba703ffdf2609755c Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 8 Mar 2019 14:31:01 -0800
Subject: [PATCH] Remove deprecated ParserOutput::legacyOptions

Change-Id: I5f32dd741f3ee795ec599aacb687d5cee2c52835
---
 RELEASE-NOTES-1.33                |  2 ++
 includes/parser/ParserOptions.php | 19 -------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index c3254196ca..694dc46869 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -285,6 +285,8 @@ because of Phabricator reports.
 * Language::markNoConversion, deprecated in 1.32, has been removed. Use
   LanguageConverter::markNoConversion instead.
 * BagOStuff::modifySimpleRelayEvent() method has been removed.
+* ParserOutput::getLegacyOptions, deprecated in 1.30, has been removed.
+  Use ParserOutput::allCacheVaryingOptions instead.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index a69e80598a..bdca848255 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -1261,25 +1261,6 @@ class ParserOptions {
 		}
 	}
 
-	/**
-	 * Returns the full array of options that would have been used by
-	 * in 1.16.
-	 * Used to get the old parser cache entries when available.
-	 * @deprecated since 1.30. You probably want self::allCacheVaryingOptions() instead.
-	 * @return string[]
-	 */
-	public static function legacyOptions() {
-		wfDeprecated( __METHOD__, '1.30' );
-		return [
-			'stubthreshold',
-			'numberheadings',
-			'userlang',
-			'thumbsize',
-			'editsection',
-			'printable'
-		];
-	}
-
 	/**
 	 * Return all option keys that vary the options hash
 	 * @since 1.30
-- 
2.20.1